Refactoring of bundle. Still in progress