Add dst support to the last commit