Working on db issue