Added last missing functions