EXPERIMENTAL - Add support for multiple primary keys. Still issues with some views