Add cider support