Properties must be part of mapping

This approach is more flexible as other attributes
in addition to properties could be specified by
models.
Merge pull request #15 from sharoonthomas/develop

Properties must be part of mapping