Add support for callback, Fix use of variables.