Little changes on scheme model