Bug fix and add in method override support