Split out baseclass