Fixed message display
Added sources field