Added all fiels necessary