[#6] Fixed schema