The other option is Hurricane Hanna's out by the pool. When we were at BC in March, it was not self-serve. When we returned in July, they had installed a self-serve refill mug station right there at Hurricane Hanna's. This was very convenient when we were at the pool, and when we were coming and going to and from DHS and EPCOT! We used it just as much (and maybe more than) the refill stations at the BC Marketplace.