Changes from UOD By Bo version 0.1 based on local database