Add support for global data