Refactor the meta property model further. Add support for complex fields.