Extended the DatabaseProvider and better FileService