More separation of concern to avoid Scope prototype