Added IntegerSource and ListSource