mapping switched to annotations