Added entities and related validators/adapters