Refactored ApplyController