Align on scope for v1

Completed on
🤔
No comments yet, be the first to help