This MR adds the missing @context property to the Collection Object and refactors it.
@context
Closes #252 (closed)