Fix DataSync
Route Patterns, HTML Macro
Route namespace
Modified API