Adjusted to new Genry architecture.