Refactored to remove complex from paths