Adding support for additional calls