Changed structure and inheritation