Added CA field support