Add system management
OPEN - ISSUE #1: Add security management