FIX: Removed usages of deprecated object manager