Various modifications to make P1EDA official instances to be called as library.