Refactoring of helper and component resolution