Added first draft of System features