Added enumerate macro