Better value handling