Fleet 0.6.0 compatibility