Adding asset server support