more Paas refactoring