Separated the classes into Shared and Value types.