Add Bundle feature and make some fixes