Added resource serving support