Datamodel changes for task  and added "raise validation error " in certain other scenarios