Added more glass support