Rebase till guest databse feature