Refactor to enable diverse hosting setup (Card #15)