Removed BS2 dependency