better schema added