Improve create bundle and create controller process