Development 6.0 support