1) add new field
2) Other improvements