Preps for 0.2.AOP Version