Service definitions, dictionary and minor fixes