Modified schema includes handling