Fix tools namespace and add flash support