Moved more functions to genericsite