DEP-51 added Status management, minor fixes