Change args order
Remove deprecated function