fixed imports and protocol version