Changed structure, added more names