Added support to assets