Updated shared assembly