Fixing the Horse/client model relationship