* Added forwarding
* Added endpoint message parsing