Feature/improve statistics