Added multi-column sorting