Add zodiac model, refactor relations and tests