Non-PK relations

Added non-PK relations for Doctrine
Navigation and links cleanup