Updated beans, dao, raw data handler