Start introducing preference variables
Improve Variable API