Added support for xx which in some cases e.g. in transaction context can become very useful