Upgrade to Base.extend