Add generation tools