Testing skeleton added
Prepare for structure changes