Doc + fetch methods Dao generation correction