Add the ability to use both class and in-content insertion on same page