Add scaffolt support