Better preferences handling