Added controller helper and modified some files