Updated base model to set properties
Updated docblock for base model
Updated query docblock