Add ann-protocol, fix types