Add support for more distributions