Added converting of values.