Added more widget types