Fixed dm bug; added animal attribute support.