Changes according to new plugghest library