Correct schema this time