Restructured and updated definitions