Added check mode
Fixed absent functionality