Add status field and refactor some code