Fixed pool ; Working on entity deletion