Added reload capability and supported more resources