Converted links and fixed deprecation in model