Slightly more configurability