Space management changes