Fix reference usage, initial model