Revert "CONN-1164: Removed unused model classes"

This reverts commit fe7de9b140482cf102c1b8613532b7106b7d8f2c.