Improve CheckList Feature