VOLDEV-16: Consistent AssetsManager usage