Track upstream changes, ugly but functional way
Add explanation to field with error