CORE-153 and CORE-191 Adding additional objects and changing the interface slightly.
CORE-153 and CORE-191 Cleaning up the API
Merge branch 'feature/CORE-153' into develop