Added namingStrategyFactory