Add m-bs support