Slowly merging manual and auto generation.
Service file is now correctly generated.
Converging between generated and manual.