- Improvements for reflection api