Added Support for BOM and CBI , bug fix