Implemented 50% of the 0.3.x API