Convert data structure in private structure

Change-Id: I96751a55ce0605135262b471bd2f8e1a5f8f63bc