Moved hack to separate processor unit to encapsulate the hack