Minor refactoring
Refactoring - split into multiple methods
Change override to be False by default