Refactor services declaration in xml