Add improvements to Penta