* Few improvements/refactorings
* Status constants moved to special class
* Few improvements/refactorings
* Status constants moved to special class