Better support for study types