Added basic cycle tag support (no asynchronicity)