Added dictionary injection support