Hacks moved to own module