Added updated plotting utility