Issue #38  more fields added