Implement bundle support
Add example bundle