More updates on spaces domain
Removal of optional and check if parent is not null