Removed application specific logic out of this framework