Added attribute sorting by type and name