model - attempt to fix circular ref error