Contrroller module code cleaned and more robust for flow pusher