Remove unneeded debug message
fix datatypes from struct to simple type
rework metadata map