Added some more descriptive elements to spaces