Add class resolution for sub-classes