better class handling #14