Unique Fields
use '_' instead of '-'
Fix serialization