Updated shared models