FIX: mapContent refactor