better class handling #16