Fix current units
Expose source fields