Changed structure
Improved references