Add backward capability