Entry Management

Additional feature to manage entry points