Removed applyChanges() method and other few adjustments