Refactored Dxf blocks