Add Collection and Map inject support #1