Changed structure and added composer