Removed contains and equals from Plan