adjusted classes to updated interfaces