Updated to work with the correct `p.a.contentypes` branch