Added statistics support