Change Integer to Long to support timestamp