added pagoda support