FIX: saving uid to extra_data