Updates to core functionality