Form and Db Entity improvements