added Map fields to Frontend