Adding multi-distribuition support