Started to add bos support