Third batch of functionality updates