Adding a scope apply to keep things better in sync