Add support for extra data