Add checks to features