Form parsing into maps added