Feature/resourcemanager