Additional and cleaner functionality in converter.