Update plot method to return figure