Second take of allowing optional fields...