File Seperator added as import
Query and Update methods moved to base class