Add shnergle support