Refactored the extenderClass a bit more.