Updated shared code