Separated domain into Omega-Rect and Rect part, removed caching