Replaced Area with general Shape
Split generation into Facade and rastering