Improved preferences attributions etc.