Rafactored scope to separate module