Bundling and model configuration added