Added support for custom assets