CreateBundle integration - moved and improved logic