Updated features model to include statitic usable query;