Use PNCollections to store PN expressions for energy
Update comments about imports