OPEN - ISSUE #11: Add system management