Better value parsing