Refactor: relocate datasource entry
Refactor:
Remove unused imports
Split user create and grants
Add data helper
refactor: use data helper