Updated Shared classes