Changes for building sites with templates added