Update of version 2 w

Added domain properties and ranges