Changed packages, added EBXL and BOP support