Removed use of reflection