Added scopes to models commenting out existing functions