Trying to fix DB interaction