Add base class for common variables