Added feature types & sample variables