add support for diamond option