Methods can now be marked as @final
Refactor @override method wrapper