Refactor to add .extend to all bases