additional entities setup
changed the strategy of json encode
added more entities