Re-added annotations module