Added Database path and formatted DatabaseImpl