Feature/fix enabled service notation