Added attribute selection