Added some improvements.
Added some reflection.