Updated to 0.9 package system