Slightly improved interface