Refactor some code
Updated Traits and added Event class
Added Prop support for adding resources and retrieving resource URIs