Added ABI split capabilities