Added some reflection for future stuff