changed database id to general identifier