Feature/service defaults improvement