Changed to use static file handler