Now saves all fields except Input variables