Added non-mandatory refferences support in web application