Changed class stucture to include parent / child structure