Adding checks for subsite