New entities and serialization, minor fixes