Small refactoring of property names, adding ability to aggregate from mo...

...del