Added B2 initial support