Start of support for cycle tag
Added basic cycle tag support (no asynchronicity)