Reworked file ops and added table ops