More refactoring : changed status to state.