Continue working on sites functionality