Made reference's model even cleaner