Templates: solver + internal dependencies working