Added thin app-server support