Add field and schema classes