Analysis: Use PreBuiltXXXFactory

  Closes #34