Fixed link creation in models