Issue #143: Extend DAO grammar
Issue #143: Extend DAO grammar
Issue #143: Extend DAO grammar