Extended activities + database patching mechanism