refactor database struct