Added more DB functionaltiy