Fix service declaration order