More Classmap Tweaking