removed typeid lookup
added system_id parameter