Updated ex and externs to working system
Separated active system and source system