Changed converters to value classes (thanks to @xuwei-k)