Fixing dependency and asiging database name