Updated to new standard Plugin System