changing resource and organizations to use common_objects