Made fields typing make sense