Better support for repeatable fields