Adding 2dplot support