Added helper file, modified sql files as well