Update to Base 1.0.1, added some helper features