added Distribution handling