Types and Fields enhancements