Add support to register bundle automatically