Refactored values from Long to Integer.