Added support for extra data (analytics)