Adding white-list functionality