Added valueOf methods