Adding some jSON stuff to entities and updating the Api a bit