Major Fixes and Updates

- Security now using Annotation instead of RequestMap
- Re-structure Interception