Replaced some legacy function calls