Added initial setup
Improved directory import and db completion