Added base extension and auto-adding.