More base functionality added.