Continue working on Sites functionality