Added support for more complex entity field types (datetime, timespan, color, etc.)