developments for 5.0 support