Added control for spaces and operations