Added ability to have aggregate orders