Updates as suggested, removed Reflection completers.