Update classes to use changed interface based on Bastl standards