cleanup
add unit to attribute entity
implement evaluate with quantity return type