Added support for additinal plotting variables