Updating deprecated calls