Slightly adjust pass API