Changes for spaces and added scenarios