Add some preliminary code for check feature