Raw material feature added and optimized for speed