Pushed logic from controller to decorator