Refactored 'Functions' Class