Upgraded to object-manage 0.8.x