Updated Reflection completer with cleaner solution.