Refactored relationships
Version update