Updates to preference handling