WIP: Optimizations. Change override declartion style.