Removed ngx dependency