Escaped apostrophes on loader
Added Date capabilities