Changes to better render extension from base.