Updated helper to use 'current' instead of 'valid'