Adding 24.4 support