Added base classes for different types of fields