Updated to work with static files