Refactor Post scopes