It may also be worth adding an "X-Men Base" or "Underground" section of the mansion, for things like the hangar for planes and special vehicles, labs, detainment cells, security rooms, cerebro, infirmary, etc.