Refactor, add support for official PostConstruct and Inject
Test fof UC29