Changed to enable extension

Some minor changes were made, in order to support a brand new webforms
focused container, not included in this assembly