Added commandHandler + comments