Added Hotel and Organization implementations