Updates to handle wider range of classes
Add note for future performance tweak