Removed @baseValue dependency

Corrections