Added messages. Added support for unique fields.