Updates to basic functionality