Implemented more property types