Genie: support added