Refactor of reply feature and spec error fix