Add base class to handle hacks