Refactored interface from module to controller