Improve pooler and cert creation