Second batch of functionality updates