Modified for plugin standards