Adjusted base classes to support rerendering