Update:convert to Service/Documentation/fix syntax errors