Take changes from fixture-class branch