Move schema definition into Schema module