Use options everywhere for consistency, no opts