Feature/thrift injection