Added further classes for selection