fix To and From fields (should be declared as objects) (issue #21)