Changed Plugin to reflect the latest API Changes