Data Resource fix. Still need to be improved