Change: from direct using of dao internal variables to using functions to access them.