Added support for extra chunks