JPA dependencies sorted, populating changed accordingly, extra datasets
added