Changed simple object properties to just properties