Add sorting support
    Trivial solution improvement coming soon.