Adding Integer support. Still experiemental.