Update BM and Addons

Close #23