Rework in classes and stubbed in twist subscribers
xml tag fix