Refactor use

Signed-off-by: crynobone <crynobone@gmail.com>
Release v2.1.4

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1' into 2.2
Release v2.2.1

Signed-off-by: crynobone <crynobone@gmail.com>