Improvements for meta/bundle