Update resource manager
Fix DataTools for null value