Updated setup methods to be consistent