Feature/managed object extension