* more updates to dao to remove @path