Make services less specific