Last parts of the implementation