Add initial point support