Fix models to use in Abstract DAO