Changed the RepositoryFactory approach so we do not need a fork of SD Commons.