added proxy add / use manual implementation