Added city and organization as optional fields for manual payments