Added classroom and section with counter cache columns