Initial implementation of rebase and current_base methods