Refactor objects && add injector