Moved set up into BaseClass