Added generate tools