Some Plugin API changes... Need to finish the API HeaderDocs sometime