Fix for unused classes