Maybe should add Guid support? Any other types?