Issue #19 : added order field