added waypoint support for wavecontrollerfactory