Initial import of the modifications needed to make more curves available