More uniform caps system for enums, and added more materials