Better note mapping