Adding eyaml support