Update for additional functions