Added scheduler (command pattern)