Changed nullable wrappers (Long) to primitive type (long)