Improved Reflections instantiation

Change-Id: Idbbc66b98fb21567c37c06dcde09fafb58d43520