Added .js support