Compile 21.0 - Minor changes applied
Example files updated