Added two types of leaves