Added object properties and refactored namespace usage
Nested concepts