Added start and stop hook