Adding base classes in preparation for java final