Removed sources package;
Fixed validator message to be lazy