Fixed deprecations, added ability to override status in uri_state