Adding map support and submit for post with data