Fix Database with helper class