Naming refactor
Added other attributes
instantiation refactoring