refactoring after erik fix for FigisDao.class