Feature/configurable bundle