Add fixes for http_status
Refactor to support AS 4.0