v3.3.3 - Codebase Improvements