Removed direct dependency on MessageSource