Added support for JS and images