Updated User references (more 1.5)