Added custom types and tests for repeating fields