Modified schema for current code