OPEN - ISSUE #1: Add security management