Updated baseclasses