Updated more property implementations