Update for Base 0.2.2