Added support for field_collection fields