added support for tonic framework