Updated fixture generator