Add multi bathroom support.