Added entity factory classes