Added more FLEx field support with tests.