Follow to changes of the implementation