Initial 0.24 support