Changed few methods in Database from Col to String
Merge remote-tracking branch 'origin/master'