Changed from YAML builtin types to domain types

It seems more proper...