Refactoring. Added more information to status.