Further updates for future functionality