New DB schema and new stop_point insert code