Added wrappers. Modified fx*, will now accept maps additionally to named args.