Changed ID from long to Integer