Updated work with GlobalTypes.