Added proper logger + referer getter fix