Support for replies, started covering by tests