Handle more distribution types