Structure update

Measured value structure update and small change in database class