Added label*source* fields