Added more checks
Added X-Referer-Config