Updated datatypes (nullable)