Update code to work with carew 2.x version