Added static resource handling