Add hbs plugin and some bugs were changed