Complete refactoring to HasMany relations :sheep: