RF added fixme in DataAccessServiceImpl