Switches to properties where necessary