Added joda bakc
Restored macro annotation check