Identify more entity fields, including Uniforms