Tweaked class resolution