CMS-3101 LiveEdit - Refactor Insertables