Emmanuel Bernard: Should this be done for 4.1? IMO, we can start with what we have currently, but if changing it later on, we'd need to provide some migration functionality, or would we leave this to users?