Added improved restriction building API