Getting rid of json dependency