Killed superfluous default value
Some fields are not supported yet
Emailmappings now works with target/resolvedtarget