Follow similar structure that we have for other protocols. Change-Id: I54cc8c99d1e91d57c3d5a92f6529ef2055e9d4ed