Add Q features assumed by smart-contract code