Moving common scopes to support module