Add more flexible stamp name support + add 10 second timeout