Improved field collections handling.