Add OneToOneField support
Performance tests, and UI changes