Add support for custom distribution