A little changes made to schema