Implementation improvement