Add support for Control keyboard navigation properties