Added more basic structure