Added @preDelete and @postDelete