Fixing attribute mapping missing + metadata added

Change-Id: I6068d8947dc824a081b33906068362529230a476