Resolves #38 PaaS types