Added scopr to System
Refactored the System model