Add class and wrap overrides