Refactor of SITE Services