TODO for respecting identifier case