Adding proxy system insted of using model