Refactoring, support Insert, Update & Delete