Class structure changes

Internal class structure changes