Initial fix for forms serialization and to make serialization uniform

Initial fix for forms serialization and to make serialization uniform #100