Add support for extra assets