Added support for Custom Model Files and BundleName parsing