Tweaking the schema