Minor fixes on the handling of scopes when using composite states
Refactoring - using Helper