Performance / memeory improvment for the consumer