More future implementation enhancement