Added field sortorder and moved id field