More base functionality updates.