Added pupplet support