CR related fix and also added support to original site builder.