Add close to db calls