Added interface and impl into res classes