Adding wirebox compatibility #1241