Changed use of reflection