Added site, changed command handler and added optional timer for program