Fix some clashes on Waypoint class and create components on NewWayPoint
class