Basic functionality updates