Updating some deprecated syntax