Make schema work