Added dictionaries and converter

Change-Id: If2680c71678e460b42cbf25c5aeee1a3dbd7efdd