Improve validation message
Fixed flattening mapping via getters