Added more intake fields and improved performance by caching Materials