Add more hacks