Updating for deprecated functions