Replace the Draw class with Path class