Add support for tinker options