Updated API to return "until" value (currently hard-coded).