Aligning the staging plugin with the standard