Handle dots in keys