Modify Hooligan to work with 2.0.alpha