Added optional fields configuration