updated to support o-assets 0.2