Added better Pi values to structures definitions.