Refactor skip block
Release 0.0.21