Refactored graphics paths