More work on versioned attributes [ci skip]