Added OrderAwareInterface