Callback improvements. Perfomance optimizations.