Serialise Map<String, Object> in PersistenceLoader, make javadoc clearer