Add support for duplicate button