Added experimental cycle support