Improve RESTRICT implementation