Changed structure around and added some role elements