Changed return type to match label, value