Refactor controller additions