Faster class splitting