Use more idiomatic constructs from Jackson library