Added domain and range restriction expressions