Fixes in domain modeling part.