Added origin_system to all appropriate resources