Moved setup logic back to base class