Added new objects that are representing basic structure - work in progress