Rewrite base classes