Add support for app and js module