Added last few missing functions for figures