Adding datasource template
Compile-fix
Persist credentials