Added plot macros