Add of proxy callback and little fixing and linting.