Added new classes for annotated properties.