Removed calls to #add_to_base