Refactored Bundle:s together with their settings