add initial do support