Changed to minimal http handler