Added more to stats and completion systems