Adding fallback functional for the older API