Classes moved to prepare a new API
Fixes for the new reflection API