Restructured to match up with 0.4.2 changes