More separation of concern to avoid Scope prototype

Will lead to new major version