Modified dao to attribute structure.