Added additional error checks, helper methods for deletes and overwrites