Added support for assets