Refactored link model spec