Added parsin of payee/location