Changed Layer 3 to POM construction.