Adding support for acknowledgements