Added Update status + refactor api factory