moved System to only components needing it