Made feature checks static