Storage of Entity sets

Unfortunately, according to Steffen , commit f3941df2 is not the right solution.