Add image handler, fix timeouts